Merge beta 22.1.0.2 #20527

mokagio · 2023-04-13T02:06:09Z

Supersedes #20525, which I was too quick at opening and didn't realize had conflicts with trunk.

Includes:

Release checks

Updates to the localization files (.strings and Fastlane metadata) automatically pulled for the new translations that have already been approved in GlotPress
Version update in .xcconfig
Diffs from the PRs that made it into this beta

Conflicts

There were conflicts on Podfile and Podfile.lock because release/22.1 and trunk both changed the Gutenberg version.

As usual, I resolved them with git checkout --theirs, keeping the value from trunk under the assumption that the latest version of Gutenberg, 1.93.0-alpha2, is what trunk needs to work and that if the
1.92.1 hotfix hasn't already been integrated in the latest release, it will be soon and the Gutenberg team will followup with a new version update on trunk.

There was also a conflict on the RELEASE-NOTES.txt that GitHub picked up with its more refined conflicts engine and that auto-merge didn't address properly but that I manually fixed.

That was due to release/22.1 adding new release note entries – which will not make it into the App Store release notes – in the 22.1 section and trunk having #20128 editing that section, too. #20128 was meant to land on release/22.1 but I forgot to update the base branch after starting the code freeze 🤦‍♂️😭

<<<<<<< release/22.1 -- Incoming Change
* [**] Add a "Personalize Home Tab" button to the bottom of the Home tab that allows changing cards visibility. [https://github.com/wordpress-mobile/WordPress-iOS/pull/20369]
* [*] [Reader] Fix an issue that was causing the app to crash when tapping the More or Share buttons in Reader Detail screen. [https://github.com/wordpress-mobile/WordPress-iOS/pull/20490]
* [*] Block editor: Avoid empty Gallery block error [https://github.com/WordPress/gutenberg/pull/49557]
=======
* [**] [internal] Refactored Google SignIn implementation to not use the Google SDK [https://github.com/wordpress-mobile/WordPress-iOS/pull/20128]
>>>>>>> trunk -- Current Change

… UIView or a UIBarButtonItem

…elease_1.92.1 Integrate gutenberg-mobile release 1.92.1

…iOS into fix/20487-reader-crash-when-wtapping-more-share-button

mokagio · 2023-04-13T02:07:52Z

RELEASE-NOTES.txt

+* [**] [internal] Refactored Google SignIn implementation to not use the Google SDK [#20128]

 22.1
 -----
 * [**] [internal] Refactor updating account related Core Data operations, which ususally happens during log in and out of the app. [#20394]
 * [***] [internal] Refactor uploading photos (from the device photo, the Free Photo library, and other sources) to the WordPress Media Library. Affected areas are where you can choose a photo and upload, including the "Media" screen, adding images to a post, updating site icon, etc. [#20322]
 * [**] [WordPress-only] Warns user about sites with only individual plugins not supporting core app features and offers the option to switch to the Jetpack app. [#20408]
-* [**] [internal] Refactored Google SignIn implementation to not use the Google SDK [#20128]


As mentioned in the PR description, this entry was in 22.1 because that's where the PR was meant to land after code freeze but I fumbled and it landed on trunk instead.

mokagio · 2023-04-13T02:09:04Z

fastlane/jetpack_metadata/ru/release_notes.txt

@@ -0,0 +1 @@
+No updates this week. In the meantime, we're just over here cooling our jets.


This is not ru 🤔

mokagio · 2023-04-13T02:09:26Z

fastlane/jetpack_metadata/es-ES/release_notes.txt

@@ -0,0 +1 @@
+No updates this week. In the meantime, we're just over here cooling our jets.


This is not es-ES 🤔

There were conflicts on `Podfile` and `Podfile.lock` because `release/22.1` and `trunk` both changed the Gutenberg version. As usual, I resolved them with `git checkout --theirs`, keeping the value from `trunk` under the assumption that the latest version of Gutenberg, 1.93.0-alpha2, is what `trunk` needs to work and that if the 1.92.1 hotfix hasn't already been integrated in the latest release, it will be soon and the Gutenberg team will followup with a new version update on `trunk`. There was also a conflict on the `RELEASE-NOTES.txt` that GitHub picked up with its more refined conflicts engine and that auto-merge didn't address properly but that I manually fixed. That was due to `release/22.1` adding new release note entries – which will not make it into the App Store release notes – in the 22.1 section and `trunk` having #20128 editing that section, too. #20128 was meant to land on `release/22.1` but I forgot to update the base branch after starting the code freeze 🤦‍♂️😭 Also, the entry about the personalize home tab had been removed on `trunk` via ec8a377. The release notes editor was notified about it, #20483 (review) ``` <<<<<<< release/22.1 -- Incoming Change * [**] Add a "Personalize Home Tab" button to the bottom of the Home tab that allows changing cards visibility. [#20369] * [*] [Reader] Fix an issue that was causing the app to crash when tapping the More or Share buttons in Reader Detail screen. [#20490] * [*] Block editor: Avoid empty Gallery block error [WordPress/gutenberg#49557] ======= * [**] [internal] Refactored Google SignIn implementation to not use the Google SDK [#20128] >>>>>>> trunk -- Current Change ```

mokagio · 2023-04-13T02:17:17Z

RELEASE-NOTES.txt

+* [*] [Reader] Fix an issue that was causing the app to crash when tapping the More or Share buttons in Reader Detail screen. [#20490]
+* [*] Block editor: Avoid empty Gallery block error [https://github.com/WordPress/gutenberg/pull/49557]


Mentioned in PR that these won't make it to the App Store:

https://github.com/wordpress-mobile/WordPress-iOS/pull/20490/files#r1164893244

https://github.com/wordpress-mobile/WordPress-iOS/pull/20497/files#r1164892641

oguzkocer

Thanks for the the detailed PR description @mokagio. The way you addressed the issues makes sense to me.

wpmobilebot · 2023-04-13T02:39:13Z

📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.

	App Name	WordPress Alpha
	Configuration	Release-Alpha
	Build Number	pr20527-011c8c3
	Version	22.1
	Bundle ID	org.wordpress.alpha
	Commit	`011c8c3`
	App Center Build	WPiOS - One-Offs #5466

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

wpmobilebot · 2023-04-13T04:22:34Z

📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Alpha
	Configuration	Release-Alpha
	Build Number	pr20527-011c8c3
	Version	22.1
	Bundle ID	com.jetpack.alpha
	Commit	`011c8c3`
	App Center Build	jetpack-installable-builds #4495

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

salimbraksa and others added 18 commits April 7, 2023 00:53

Add a PopoverAnchor enum indicating that the anchor could either be a…

fdbe668

… UIView or a UIBarButtonItem

Add UIPopoverPresentationController+PopoverAnchor.swift file

c4176a2

Pass a UIBarButtonItem anchor to ReaderShowMenuAction

023f66b

Pass a UIBarButtonItem anchor to PostSharingController

5571dc9

Update RELEASE-NOTES

a520d13

Release script: Update gutenberg-mobile ref

657f3e9

build: Update Gutenberg ref

77e078b

docs: Add release note

5b97fe8

build: Update Gutenberg ref

64d5bb1

fix: Podfile typo

d10a1c1

build: Install Pods

f3588e2

Merge pull request #20497 from wordpress-mobile/gutenberg/integrate_r…

dedeb9d

…elease_1.92.1 Integrate gutenberg-mobile release 1.92.1

Merge branch 'release/22.1' of github.com:wordpress-mobile/WordPress-…

b99189a

…iOS into fix/20487-reader-crash-when-wtapping-more-share-button

Fix crash when tapping more and share from Reader Details (#20490)

35ac8a9

Update app translations – Localizable.strings

ff2ebc1

Update WordPress metadata translations

34d562b

Update Jetpack metadata translations

d4b4327

Bump version number

25d5678

mokagio mentioned this pull request Apr 13, 2023

Merge beta 22.1.0.2 #20525

Closed

3 tasks

mokagio commented Apr 13, 2023

View reviewed changes

mokagio force-pushed the merge/release-22.1.0.2-into-trunk branch from c214ba2 to 011c8c3 Compare April 13, 2023 02:17

mokagio commented Apr 13, 2023

View reviewed changes

mokagio added the Releases label Apr 13, 2023

mokagio added this to the 22.1 ❄️ milestone Apr 13, 2023

mokagio requested a review from a team April 13, 2023 02:17

oguzkocer approved these changes Apr 13, 2023

View reviewed changes

mokagio enabled auto-merge April 13, 2023 04:01

mokagio disabled auto-merge April 13, 2023 05:35

mokagio merged commit 62c84b2 into trunk Apr 13, 2023

mokagio deleted the merge/release-22.1.0.2-into-trunk branch April 13, 2023 05:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge beta 22.1.0.2 #20527

Merge beta 22.1.0.2 #20527

mokagio commented Apr 13, 2023

mokagio Apr 13, 2023

mokagio Apr 13, 2023

mokagio Apr 13, 2023

mokagio Apr 13, 2023

oguzkocer left a comment

wpmobilebot commented Apr 13, 2023 •

edited

Loading

wpmobilebot commented Apr 13, 2023

		@@ -0,0 +1 @@
		No updates this week. In the meantime, we're just over here cooling our jets.

		* [*] [Reader] Fix an issue that was causing the app to crash when tapping the More or Share buttons in Reader Detail screen. [#20490]
		* [*] Block editor: Avoid empty Gallery block error [https://github.com/WordPress/gutenberg/pull/49557]

Merge beta 22.1.0.2 #20527

Merge beta 22.1.0.2 #20527

Conversation

mokagio commented Apr 13, 2023

Release checks

Conflicts

mokagio Apr 13, 2023

Choose a reason for hiding this comment

mokagio Apr 13, 2023

Choose a reason for hiding this comment

mokagio Apr 13, 2023

Choose a reason for hiding this comment

mokagio Apr 13, 2023

Choose a reason for hiding this comment

oguzkocer left a comment

Choose a reason for hiding this comment

wpmobilebot commented Apr 13, 2023 • edited Loading

wpmobilebot commented Apr 13, 2023

wpmobilebot commented Apr 13, 2023 •

edited

Loading